Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Dec 2011 18:15:18 +0000 (10:15 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Dec 2011 18:15:18 +0000 (10:15 -0800)
commit6a95a341dc40ab236f4f34a54c78d849de1989bd
treeae45a2de6b39fde6164b07e51b5684a1d0763554
parentec6d364cb07c97cc076cb06ebda94d96b3486841
parent85629edd1d2055482f49c136b0652e181263efc0
Merge from trunk.